Fix for the crash from #6367 #6375
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
abadams
reviewed
Nov 2, 2021
src/BoundsInference.cpp
Outdated
| @@ -1133,7 +1133,9 @@ class BoundsInference : public IRMutator { | |||
| auto boxes = boxes_provided(body, empty_scope, func_bounds); | |||
| for (const auto &fused : fused_group) { | |||
| string fused_stage_name = fused.first + ".s" + std::to_string(fused.second); | |||
| boxes_for_fused_group[fused_stage_name] = boxes[fused.first]; | |||
| if (boxes.count(fused.first) > 0) { | |||
There was a problem hiding this comment.
Doesn't this do a double-lookup? How about:
auto it = boxes.find(fused.first);
if (it != boxes.end()) {
boxes_for_fused_group[fused_stage_name] = it->second;
}
abadams
reviewed
Nov 2, 2021
test/correctness/compute_with.cpp
Outdated
| @@ -2110,6 +2110,93 @@ int rvar_bounds_test() { | |||
| return 0; | |||
| } | |||
|
|
|||
| int two_compute_at_test() { | |||
| ImageParam input1(Int(16), 2, "input1"); | |||
| ; | |||
abadams
reviewed
Nov 2, 2021
| @@ -2110,6 +2110,93 @@ int rvar_bounds_test() { | |||
| return 0; | |||
| } | |||
|
|
|||
| int two_compute_at_test() { | |||
There was a problem hiding this comment.
Worth commenting with the issue number that this test case came from, so that later readers have context
abadams
approved these changes
Nov 2, 2021
|
Test failures are not related, going to merge. |
abadams
added
the
backport me
abadams
pushed a commit
that referenced
this pull request
Jan 20, 2022
abadams
pushed a commit
that referenced
this pull request
Jan 20, 2022
abadams
pushed a commit
that referenced
this pull request
Jan 20, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
It would add an empty box for the function even if box_provided didn't return anything for this function, which would later cause a crash when we try to generate min/max lets for the given function.